Packaging: accept normalized Marvin archive names by Dogface2k · Pull Request #13793 · apache/cloudstack

Dogface2k · 2026-08-04T18:51:55Z

Summary

Setuptools 69.3.0 introduced PEP 625-compliant normalization of
source-distribution filenames.

Although the Python project is declared as name="Marvin", current
Setuptools versions produce:

marvin-<version>.tar.gz

Older versions may still produce:

Marvin-<version>.tar.gz

Update the Debian packaging consumers to match [Mm]arvin-*.tar.gz,
allowing both forms to remain supported.

This only changes archive discovery during packaging and installation.
It does not alter the Marvin archive contents or CloudStack runtime
behaviour.

still need review
packaging/el8/cloud.spec
packaging/suse15/cloud.spec
tools/marvin/pom.xml

will tighten patterns

DaanHoogland

clgtm

codecov · 2026-08-05T07:43:59Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 19.78%. Comparing base (4f11707) to head (1127798).
⚠️ Report is 114 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #13793      +/-   ##
============================================
+ Coverage     19.65%   19.78%   +0.13%     
- Complexity    19792    19993     +201     
============================================
  Files          6368     6371       +3     
  Lines        574881   575909    +1028     
  Branches      70351    70509     +158     
============================================
+ Hits         112970   113929     +959     
+ Misses       449639   449549      -90     
- Partials      12272    12431     +159

Flag	Coverage Δ
uitests	`3.52% <ø> (+0.11%)`	⬆️
unittests	`21.05% <ø> (+0.13%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

weizhouapache

code lgtm

it is consistent with @DaanHoogland 's PR: #11873

weizhouapache · 2026-08-05T08:07:53Z

@blueorangutan package

blueorangutan · 2026-08-05T08:10:05Z

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-08-05T08:59:25Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 18774

DaanHoogland · 2026-08-05T09:55:38Z

the marvin box the smoke tests use is el, but marvin is also installed on the MSs, so

@blueorangutan test u26 kvm-u26

blueorangutan · 2026-08-05T09:56:04Z

@DaanHoogland [SL] unsupported parameters provided. Supported mgmt server os are: suse15, alma10, ol10, rocky10, alma9, centos7, centos6, rocky9, alma8, ubuntu18, ol9, ol8, ubuntu22, debian12, ubuntu20, ubuntu26, rocky8, ubuntu24. Supported hypervisors are: kvm-centos6, kvm-centos7, kvm-rocky8, kvm-rocky9, kvm-rocky10, kvm-ol8, kvm-ol9, kvm-ol10, kvm-alma8, kvm-alma9, kvm-alma10, kvm-ubuntu18, kvm-ubuntu20, kvm-ubuntu22, kvm-ubuntu24, kvm-ubuntu26, kvm-debian12, kvm-suse15, vmware-55u3, vmware-60u2, vmware-65u2, vmware-67u3, vmware-70u1, vmware-70u2, vmware-70u3, vmware-80, vmware-80u1, vmware-80u2, vmware-80u3, vmware-80u3e, xenserver-65sp1, xenserver-71, xenserver-74, xenserver-84, xcpng74, xcpng76, xcpng80, xcpng81, xcpng82, xcpng83

DaanHoogland · 2026-08-05T10:26:53Z

@blueorangutan test ubuntu24 kvm-ubuntu26

blueorangutan · 2026-08-05T10:28:07Z

@DaanHoogland a [SL] Trillian-Jenkins test job (ubuntu24 mgmt + kvm-ubuntu26) has been kicked to run smoke tests

weizhouapache · 2026-08-05T10:32:51Z

the marvin box the smoke tests use is el, but marvin is also installed on the MSs, so

also, the ubuntu container to build debian/ubuntu packages are old, it still wrote to Marvin-xxxx.tgz

blueorangutan · 2026-08-06T03:22:18Z

[SF] Trillian test result (tid-24)
Environment: kvm-ubuntu26 (x2), zone: Advanced Networking with Mgmt server u24
Total time taken: 57557 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr13793-n24-kvm-ubuntu26.zip
Smoke tests completed. 156 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

Dogface2k · 2026-08-06T14:37:52Z

reviewing

abh1sar · 2026-09-08T12:58:51Z

@Dogface2k Can we add the same change to packaging/el8/cloud.spec and packaging/suse15/cloud.spec in this PR?

Use [Mm]arvin-*.tar.gz when copying, listing and installing the Marvin archive in the EL8 and SUSE15 RPM specs. Keep legacy uppercase archive names supported. Tighten the Debian manifest to the same version-delimited pattern.

abh1sar

LGTM

abh1sar · 2026-09-09T07:59:19Z

@Dogface2k can this be merged or is some work pending?

weizhouapache · 2026-09-09T08:18:57Z

@Dogface2k can this be merged or is some work pending?

@abh1sar
the docker containers we are using for packaging jobs are very old. They still generate Marvin-*.tgz

the code lgtm
it would be good if someone build packages manually in recent OSes (I think marvin-.tgz will be created), and test the installation of cloudstack-marvin (in debian/ubuntu and rhel/suse containers), currently we use ol9 as marvin node in testing.

Dogface2k · 2026-09-09T09:03:37Z

@Dogface2k can this be merged or is some work pending?

@abh1sar the docker containers we are using for packaging jobs are very old. They still generate Marvin-*.tgz

the code lgtm it would be good if someone build packages manually in recent OSes (I think marvin-.tgz will be created), and test the installation of cloudstack-marvin (in debian/ubuntu and rhel/suse containers), currently we use ol9 as marvin node in testing.

This can be merged if there is anything else please let me know.

weizhouapache · 2026-09-09T09:07:08Z

@Dogface2k can this be merged or is some work pending?

@abh1sar the docker containers we are using for packaging jobs are very old. They still generate Marvin-*.tgz
the code lgtm it would be good if someone build packages manually in recent OSes (I think marvin-.tgz will be created), and test the installation of cloudstack-marvin (in debian/ubuntu and rhel/suse containers), currently we use ol9 as marvin node in testing.

This can be merged if there is anything else please let me know.

@Dogface2k
have you tested the packaging with any OSes ?

Dogface2k · 2026-09-09T09:10:54Z

@Dogface2k can this be merged or is some work pending?

@abh1sar the docker containers we are using for packaging jobs are very old. They still generate Marvin-*.tgz
the code lgtm it would be good if someone build packages manually in recent OSes (I think marvin-.tgz will be created), and test the installation of cloudstack-marvin (in debian/ubuntu and rhel/suse containers), currently we use ol9 as marvin node in testing.

This can be merged if there is anything else please let me know.

@Dogface2k have you tested the packaging with any OSes ?

I have not tested assuming someone will. I left in draft for me to test later today or tomorrow.

Dogface2k · 2026-09-09T09:15:22Z

@Dogface2k can this be merged or is some work pending?

@abh1sar the docker containers we are using for packaging jobs are very old. They still generate Marvin-*.tgz
the code lgtm it would be good if someone build packages manually in recent OSes (I think marvin-.tgz will be created), and test the installation of cloudstack-marvin (in debian/ubuntu and rhel/suse containers), currently we use ol9 as marvin node in testing.

This can be merged if there is anything else please let me know.

@Dogface2k have you tested the packaging with any OSes ?

Got some tests queued now!

packaging: accept normalized Marvin archive name

f1f6350

boring-cyborg Bot added the distro:ubuntu label Aug 4, 2026

DaanHoogland approved these changes Aug 5, 2026

View reviewed changes

DaanHoogland added the needs-testing label Aug 5, 2026

weizhouapache approved these changes Aug 5, 2026

View reviewed changes

Dogface2k force-pushed the agent/packaging-normalized-marvin-archive branch from f1f6350 to 973c656 Compare August 6, 2026 18:40

boring-cyborg Bot added component:build component:marvin component:packaging component:storage docker Python Warning... Python code Ahead! labels Aug 6, 2026

Dogface2k force-pushed the agent/packaging-normalized-marvin-archive branch from 973c656 to f1f6350 Compare August 6, 2026 18:42

Dogface2k marked this pull request as ready for review August 6, 2026 23:19

DaanHoogland added this to CloudStack Testing Aug 10, 2026

github-project-automation Bot moved this to Backlog in CloudStack Testing Aug 10, 2026

DaanHoogland moved this from Backlog to Ready in CloudStack Testing Aug 31, 2026

DaanHoogland assigned abh1sar Sep 1, 2026

abh1sar moved this from Ready to In progress in CloudStack Testing Sep 8, 2026

Dogface2k marked this pull request as draft September 8, 2026 18:11

packaging: accept normalized Marvin archives in RPMs

1127798

Use [Mm]arvin-*.tar.gz when copying, listing and installing the Marvin archive in the EL8 and SUSE15 RPM specs. Keep legacy uppercase archive names supported. Tighten the Debian manifest to the same version-delimited pattern.

abh1sar approved these changes Sep 9, 2026

View reviewed changes

Dogface2k marked this pull request as ready for review September 9, 2026 09:01

Uh oh!

Conversation

Dogface2k commented Aug 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented Aug 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Aug 5, 2026

Uh oh!

blueorangutan commented Aug 5, 2026

Uh oh!

blueorangutan commented Aug 5, 2026

Uh oh!

DaanHoogland commented Aug 5, 2026

Uh oh!

blueorangutan commented Aug 5, 2026

Uh oh!

DaanHoogland commented Aug 5, 2026

Uh oh!

blueorangutan commented Aug 5, 2026

Uh oh!

weizhouapache commented Aug 5, 2026

Uh oh!

blueorangutan commented Aug 6, 2026

Uh oh!

Dogface2k commented Aug 6, 2026

Uh oh!

abh1sar commented Sep 8, 2026

Uh oh!

abh1sar left a comment

Choose a reason for hiding this comment

Uh oh!

abh1sar commented Sep 9, 2026

Uh oh!

weizhouapache commented Sep 9, 2026

Uh oh!

Dogface2k commented Sep 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

weizhouapache commented Sep 9, 2026

Uh oh!

Dogface2k commented Sep 9, 2026

Uh oh!

Dogface2k commented Sep 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Dogface2k commented Aug 4, 2026 •

edited

Loading

codecov Bot commented Aug 5, 2026 •

edited

Loading

Dogface2k commented Sep 9, 2026 •

edited

Loading